Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 30 Dec 2011 05:28:58 +0000 (21:28 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 30 Dec 2011 05:28:58 +0000 (21:28 -0800)
commitcc2fe7d366d562748391d894d3e39da870008491
tree22444a051f78a0dbd8cde0126d3a35db48f6a520
parent17c4c7e5350c75e0cb1826043d62aaa65173d917
parent3999082ae75f1ca6feceab13b37ee16f2c065b2a
Merge from trunk.